From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 24 Nov 2012 15:38:21 +0000 (+0100)
Subject: status/keyboard: remove the property whitelist
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5235
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5de91197ae68e9986f2220fa14b218592c54f1d0;p=gnome-shell.git

status/keyboard: remove the property whitelist

It was just a stopgap solution for 3.6, as the necessary UI bits
were not implemented.

https://bugzilla.gnome.org/show_bug.cgi?id=682318
---

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index cf036ac57..a5b827ad8 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -185,12 +185,6 @@ const InputSourceIndicator = new Lang.Class({
     Name: 'InputSourceIndicator',
     Extends: PanelMenu.Button,
 
-    _propertiesWhitelist: [
-        'InputMode',
-        'TypingMode',
-        'DictMode'
-    ],
-
     _init: function() {
         this.parent(0.0, _("Keyboard"));
 
@@ -394,24 +388,12 @@ const InputSourceIndicator = new Lang.Class({
         return String.fromCharCode(0x2328); // keyboard glyph
     },
 
-    _propertyWhitelisted: function(prop) {
-        for (let i = 0; i < this._propertiesWhitelist.length; ++i) {
-            let key = prop.get_key();
-            if (key.substr(0, this._propertiesWhitelist[i].length) == this._propertiesWhitelist[i])
-                return true;
-        }
-        return false;
-    },
-
     _ibusPropertiesRegistered: function(im, props) {
         this._properties = props;
         this._buildPropSection();
     },
 
     _ibusPropertyUpdated: function(im, prop) {
-        if (!this._propertyWhitelisted(prop))
-            return;
-
         if (this._updateSubProperty(this._properties, prop))
             this._buildPropSection();
     },
@@ -468,8 +450,7 @@ const InputSourceIndicator = new Lang.Class({
         for (let i = 0; (p = props.get(i)) != null; ++i) {
             let prop = p;
 
-            if (!this._propertyWhitelisted(prop) ||
-                !prop.get_visible())
+            if (!prop.get_visible())
                 continue;
 
             if (prop.get_key() == 'InputMode') {